Merge changes from emacs-23 branch

diff --cc src/ChangeLog
index 26b29320bc2b6f97f3e6a0713dc4ea83c8e5adc1,1cc60dd05868333bf5ea761e8eef6f647eef72f8..84258e2fc24011ee1f040201369c94aa857aeb47
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,13 +1,17 @@@
+ 2011-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * xdisp.c (expose_window): Save original value of phys_cursor_on_p
+       and turn window cursor on if cleared (Bug#9415).
+ 
+ 2011-09-18  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * search.c (boyer_moore): Take unibyte characters from pattern
+       literally.  (Bug#9458)
+ 
 +2011-09-18  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
 +
  2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
  
        Fix minor problem found by static checking.

diff --cc src/xdisp.c
Simple merge